From 7c9a9bf353f1070e2397000fb83bbd7544a90573 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Fri, 5 Jan 2024 06:56:41 +0100 Subject: [PATCH] Update patches --- debian/patches/10_matplotlib.patch | 8 ++--- .../20_do_not_link_against_socket.patch | 8 ++--- debian/patches/30_drop_medical_example.patch | 8 ++--- debian/patches/40_vtkpython-9.patch | 6 ++-- .../patches/50_fix_python-modules_path.patch | 16 ++++----- debian/patches/60_fix_path_perl.patch | 36 +++++++++---------- debian/patches/83_allow_gles_platforms.patch | 26 -------------- ...tTexture_no_vtkOpenGLCheckErrorMacro.patch | 10 +++--- debian/patches/95_java_mach-arch_fix.patch | 6 ++-- debian/patches/97_reproducible_builds.patch | 6 ++-- debian/patches/98_fix_mpi4py.py | 8 ++--- debian/patches/99_fix_ftbfs.patch | 6 ++-- debian/patches/gcc-13.patch | 30 ---------------- debian/patches/series | 3 -- 14 files changed, 59 insertions(+), 118 deletions(-) delete mode 100644 debian/patches/83_allow_gles_platforms.patch delete mode 100644 debian/patches/gcc-13.patch diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch index bdfbb09a7..3e739a948 100644 --- a/debian/patches/10_matplotlib.patch +++ b/debian/patches/10_matplotlib.patch @@ -1,9 +1,9 @@ Description: _matplotlib -Index: VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +Index: VTK-9.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h =================================================================== ---- VTK-9.2.5.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -199,6 +199,10 @@ private: +--- VTK-9.3.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ VTK-9.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -190,6 +190,10 @@ private: * to implement IsAvailable. */ static Availability CheckMPLAvailability(); diff --git a/debian/patches/20_do_not_link_against_socket.patch b/debian/patches/20_do_not_link_against_socket.patch index 87bd61a7b..15f4bf44a 100644 --- a/debian/patches/20_do_not_link_against_socket.patch +++ b/debian/patches/20_do_not_link_against_socket.patch @@ -1,10 +1,10 @@ Description: Do not try linking with -lsocket -Index: VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake +Index: VTK-9.3.0/Common/System/vtkTestSocketFeatures.cmake =================================================================== ---- VTK-9.2.5.orig/Common/System/vtkTestSocketFeatures.cmake -+++ VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake -@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam +--- VTK-9.3.0.orig/Common/System/vtkTestSocketFeatures.cmake ++++ VTK-9.3.0/Common/System/vtkTestSocketFeatures.cmake +@@ -11,9 +11,6 @@ check_library_exists("socket" getsocknam if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T) set(VTK_GETSOCKNAME_LIBS) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch index e95bc66ed..4c1342849 100644 --- a/debian/patches/30_drop_medical_example.patch +++ b/debian/patches/30_drop_medical_example.patch @@ -1,11 +1,11 @@ Description: Drop medical examples Last-Update: 2020-10-21 -Index: VTK-9.2.5/Examples/CMakeLists.txt +Index: VTK-9.3.0/Examples/CMakeLists.txt =================================================================== ---- VTK-9.2.5.orig/Examples/CMakeLists.txt -+++ VTK-9.2.5/Examples/CMakeLists.txt -@@ -56,7 +56,7 @@ else () +--- VTK-9.3.0.orig/Examples/CMakeLists.txt ++++ VTK-9.3.0/Examples/CMakeLists.txt +@@ -61,7 +61,7 @@ else () add_example(IO/Cxx) add_example(ImageProcessing/Cxx) add_example(Infovis/Cxx) diff --git a/debian/patches/40_vtkpython-9.patch b/debian/patches/40_vtkpython-9.patch index e09b28361..a663f2398 100644 --- a/debian/patches/40_vtkpython-9.patch +++ b/debian/patches/40_vtkpython-9.patch @@ -2,10 +2,10 @@ Description: Rename vtkpython to vtkpython-9.0 Author: Anton Gladky Last-Update: 2020-11-05 -Index: VTK-9.2.5/Wrapping/Python/CMakeLists.txt +Index: VTK-9.3.0/Wrapping/Python/CMakeLists.txt =================================================================== ---- VTK-9.2.5.orig/Wrapping/Python/CMakeLists.txt -+++ VTK-9.2.5/Wrapping/Python/CMakeLists.txt +--- VTK-9.3.0.orig/Wrapping/Python/CMakeLists.txt ++++ VTK-9.3.0/Wrapping/Python/CMakeLists.txt @@ -23,21 +23,21 @@ endif () # The interpreters are not supported in wheel builds, so skip them. diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch index 1114f017f..7ad656410 100644 --- a/debian/patches/50_fix_python-modules_path.patch +++ b/debian/patches/50_fix_python-modules_path.patch @@ -2,11 +2,11 @@ Description: Fix path for the installation of python modules Author: Anton Gladky Last-Update: 2020-11-06 -Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake +Index: VTK-9.3.0/CMake/vtkModuleWrapPython.cmake =================================================================== ---- VTK-9.2.5.orig/CMake/vtkModuleWrapPython.cmake -+++ VTK-9.2.5/CMake/vtkModuleWrapPython.cmake -@@ -87,7 +87,7 @@ function (vtk_module_python_default_dest +--- VTK-9.3.0.orig/CMake/vtkModuleWrapPython.cmake ++++ VTK-9.3.0/CMake/vtkModuleWrapPython.cmake +@@ -78,7 +78,7 @@ function (vtk_module_python_default_dest "for Python modules.") set(_vtk_python_version_suffix) endif () @@ -15,11 +15,11 @@ Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake endif () set("${var}" "${destination}" PARENT_SCOPE) -Index: VTK-9.2.5/Utilities/Python/CMakeLists.txt +Index: VTK-9.3.0/Utilities/Python/CMakeLists.txt =================================================================== ---- VTK-9.2.5.orig/Utilities/Python/CMakeLists.txt -+++ VTK-9.2.5/Utilities/Python/CMakeLists.txt -@@ -85,7 +85,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) +--- VTK-9.3.0.orig/Utilities/Python/CMakeLists.txt ++++ VTK-9.3.0/Utilities/Python/CMakeLists.txt +@@ -61,7 +61,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") else () set(VTK_PYTHON_SITE_PACKAGES_SUFFIX diff --git a/debian/patches/60_fix_path_perl.patch b/debian/patches/60_fix_path_perl.patch index c6c9b0a34..2a50bd7a8 100644 --- a/debian/patches/60_fix_path_perl.patch +++ b/debian/patches/60_fix_path_perl.patch @@ -2,60 +2,60 @@ Description: Fix shebang for the perl scripts Author: Anton Gladky Last-Update: 2020-11-08 -Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_class2example.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2004-06-09 11:12:38 barre> # # Build cross-references between classes and examples -Index: VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_cleanhtml.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_cleanhtml.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_cleanhtml.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_cleanhtml.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-10-25 20:17:59 barre> # # Clean the HTML generated by Doxygen to remove some layout quicks -Index: VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_codematch.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_codematch.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_codematch.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_codematch.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-01-18 16:17:26 barre> # # Summary ? -Index: VTK-9.2.5/Utilities/Doxygen/doc_index.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_index.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_index.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_index.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_index.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_index.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-11-21 17:40:48 barre> # # Build full-text index -Index: VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_rmpath.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_rmpath.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_rmpath.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_rmpath.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-10-05 11:49:40 barre> # # Remove path to intermediate Doxygen dir from html doc -Index: VTK-9.2.5/Utilities/Doxygen/doc_version.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_version.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_version.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_version.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_version.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_version.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/debian/patches/83_allow_gles_platforms.patch b/debian/patches/83_allow_gles_platforms.patch deleted file mode 100644 index 375bc7bbb..000000000 --- a/debian/patches/83_allow_gles_platforms.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: HACK: QVTKOpenGLWindow.cxx: Define GL_BACK_{LEFT,RIGHT} for Qt with OpenGL ES -From: Adrian Bunk - -Date: Fri, 11 Dec 2020 10:42:37 +0200 - - ---- - GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx -=================================================================== ---- VTK-9.2.5.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx -+++ VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx -@@ -34,6 +34,11 @@ - #include "vtkObjectFactory.h" - #include "vtkOpenGLState.h" - -+#ifndef GL_BACK_LEFT -+#define GL_BACK_LEFT GL_BACK -+#define GL_BACK_RIGHT GL_BACK -+#endif -+ - QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p) - : QVTKOpenGLWindow(vtkSmartPointer::New(), nullptr, ub, p) - { diff --git a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch index 21121325b..206b73ed7 100644 --- a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch +++ b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch @@ -2,11 +2,11 @@ Description: HACK: vtkQWidgetTexture.cxx: Don't use vtkOpenGLCheckErrorMacro Fixes building for Qt with OpenGL ES. Author: Adrian Bunk -Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx +Index: VTK-9.3.0/GUISupport/Qt/vtkQWidgetTexture.cxx =================================================================== ---- VTK-9.2.5.orig/GUISupport/Qt/vtkQWidgetTexture.cxx -+++ VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx -@@ -18,7 +18,7 @@ +--- VTK-9.3.0.orig/GUISupport/Qt/vtkQWidgetTexture.cxx ++++ VTK-9.3.0/GUISupport/Qt/vtkQWidgetTexture.cxx +@@ -7,7 +7,7 @@ #include "vtkOpenGLResourceFreeCallback.h" #include "vtkOpenGLState.h" @@ -15,7 +15,7 @@ Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx #include #include -@@ -98,7 +98,7 @@ vtkQWidgetTexture::vtkQWidgetTexture() +@@ -88,7 +88,7 @@ vtkQWidgetTexture::vtkQWidgetTexture() } this->Create2DFromRaw(width, height, 4, VTK_UNSIGNED_CHAR, this->ImageBuffer); diff --git a/debian/patches/95_java_mach-arch_fix.patch b/debian/patches/95_java_mach-arch_fix.patch index 73119c26c..7f5399c29 100644 --- a/debian/patches/95_java_mach-arch_fix.patch +++ b/debian/patches/95_java_mach-arch_fix.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Fix build on mach-based OS which are not OS X include/diy/time.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +Index: VTK-9.3.0/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp =================================================================== ---- VTK-9.2.5.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -+++ VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +--- VTK-9.3.0.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp ++++ VTK-9.3.0/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp @@ -3,10 +3,10 @@ #ifndef _WIN32 diff --git a/debian/patches/97_reproducible_builds.patch b/debian/patches/97_reproducible_builds.patch index 09affe088..b5ee14187 100644 --- a/debian/patches/97_reproducible_builds.patch +++ b/debian/patches/97_reproducible_builds.patch @@ -8,10 +8,10 @@ Thanks to Bernhard M. Wiedemann . Utilities/Doxygen/doc_class2example.pl | 1 + 1 file changed, 1 insertion(+) -Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +Index: VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl =================================================================== ---- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl -+++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +--- VTK-9.3.0.orig/Utilities/Doxygen/doc_class2example.pl ++++ VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl @@ -261,6 +261,7 @@ if (exists $args{"parser"}) { } else { @parsers = keys %parsers; diff --git a/debian/patches/98_fix_mpi4py.py b/debian/patches/98_fix_mpi4py.py index c3fdfc35a..71f1423e8 100644 --- a/debian/patches/98_fix_mpi4py.py +++ b/debian/patches/98_fix_mpi4py.py @@ -2,11 +2,11 @@ Description: Fix mpi4py search Author: Anton Gladky Last-Update: 2021-09-17 -Index: VTK-9.2.5/Parallel/MPI4Py/vtk.module +Index: VTK-9.3.0/Parallel/MPI4Py/vtk.module =================================================================== ---- VTK-9.2.5.orig/Parallel/MPI4Py/vtk.module -+++ VTK-9.2.5/Parallel/MPI4Py/vtk.module -@@ -12,4 +12,3 @@ DEPENDS +--- VTK-9.3.0.orig/Parallel/MPI4Py/vtk.module ++++ VTK-9.3.0/Parallel/MPI4Py/vtk.module +@@ -16,4 +16,3 @@ DEPENDS PRIVATE_DEPENDS VTK::ParallelMPI VTK::mpi diff --git a/debian/patches/99_fix_ftbfs.patch b/debian/patches/99_fix_ftbfs.patch index fdf8a2c50..b7cc0e768 100644 --- a/debian/patches/99_fix_ftbfs.patch +++ b/debian/patches/99_fix_ftbfs.patch @@ -2,10 +2,10 @@ Description: Fix FTBFS Author: Anton Gladky Last-Update: 2021-11-14 -Index: VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake +Index: VTK-9.3.0/CMake/vtkCompilerExtraFlags.cmake =================================================================== ---- VTK-9.2.5.orig/CMake/vtkCompilerExtraFlags.cmake -+++ VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake +--- VTK-9.3.0.orig/CMake/vtkCompilerExtraFlags.cmake ++++ VTK-9.3.0/CMake/vtkCompilerExtraFlags.cmake @@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) include(CheckCXXCompilerFlag) diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch deleted file mode 100644 index a61b4acef..000000000 --- a/debian/patches/gcc-13.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001 -From: Laurent Rineau -Date: Tue, 17 Jan 2023 16:18:53 +0100 -Subject: Add #include to compile with gcc13 -Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b - -The `vtkSEPReader` was introduced by MRs !4909 (from my former -collaborator Maxime) and !4938. Then it was highly modified by -!7516. The later MR is the one that introduced the uses of -`std::uint8_t` and `std::uint32_t`. - -Those types needs the inclusion of ``. ---- - IO/Image/vtkSEPReader.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/IO/Image/vtkSEPReader.h -+++ b/IO/Image/vtkSEPReader.h -@@ -25,8 +25,9 @@ - #include "vtkImageAlgorithm.h" - #include "vtkNew.h" // for ivars - --#include // for std::array --#include // for std::string -+#include // for std::array -+#include // for std::uint8_t and std::uint32_t -+#include // for std::string - - namespace details - { diff --git a/debian/patches/series b/debian/patches/series index bbde548ff..4408e1ac2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,11 +4,8 @@ 40_vtkpython-9.patch 50_fix_python-modules_path.patch 60_fix_path_perl.patch -83_allow_gles_platforms.patch 84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch 95_java_mach-arch_fix.patch 97_reproducible_builds.patch 98_fix_mpi4py.py 99_fix_ftbfs.patch -#110_vtk9_netcdf.patch -gcc-13.patch -- 2.30.2